From d82b7d255e0535d506d105b83a397fd6461bec17 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Mon, 14 Jul 2003 14:33:54 +0000 Subject: [PATCH] bitkeeper revision 1.339.1.5 (3f12bf52q2jR3Bjy5IVRUmb2tYPLpw) dom0_defs.h: Fix xi_ tools to get return code from privcmd proc file. --- tools/internal/dom0_defs.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/internal/dom0_defs.h b/tools/internal/dom0_defs.h index 9ef8d0645d..2a59c2553b 100644 --- a/tools/internal/dom0_defs.h +++ b/tools/internal/dom0_defs.h @@ -14,7 +14,14 @@ #include #include -#include +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned long u32; +typedef unsigned long long u64; +typedef signed char s8; +typedef signed short s16; +typedef signed long s32; +typedef signed long long s64; #include "mem_defs.h" #include @@ -29,7 +36,7 @@ static inline int do_privcmd(unsigned int cmd, unsigned long data) { - int fd; + int fd, ret; if ( (fd = open("/proc/xeno/privcmd", O_RDWR)) < 0 ) { @@ -37,7 +44,7 @@ static inline int do_privcmd(unsigned int cmd, unsigned long data) return -1; } - if ( ioctl(fd, cmd, data) < 0 ) + if ( (ret = ioctl(fd, cmd, data)) < 0 ) { #ifndef SILENT_ERRORS_FROM_XEN PERROR("Error when executing privileged control ioctl"); @@ -47,7 +54,7 @@ static inline int do_privcmd(unsigned int cmd, unsigned long data) } close(fd); - return 0; + return ret; } static inline int xldev_to_physdev(int xldev) -- 2.30.2